Merge branch 'tag-edit-subnav' into 'master'

Fix layout of edit tags page

#### What does this MR do?
Fixes layout of edit tags page

#### Why was this MR needed?
Layout was broken

#### Screenshots (if relevant)
Before:    
![Screen_Shot_2016-08-18_at_1.33.00_PM](/uploads/9e9e52bdc0743971d6e0996e2c2030a0/Screen_Shot_2016-08-18_at_1.33.00_PM.png)
After:    
![Screen_Shot_2016-08-18_at_1.32.08_PM](/uploads/0a4a93508f0c98cb0788a2c70ee33f4e/Screen_Shot_2016-08-18_at_1.32.08_PM.png)


See merge request !5874