Fixed the layout for the category filter button
Removed the admin template
Merge branch 'base-from-develop' into test