Layout and actionsimprovements
Layout improvements