Small modifications on the main layout