Minor changes on layouts