layout and main actions updated