* Improvements in Layout to fit better in Mobile
* Minor Fixes