* Improvements in main layout