* Fixed layout distribution on large screens (10' tablets)
* Cleaning of code (a little)