Ammends for tablet

- Removed duplicated classes
- Improved nested behaviour for medium sized screens