fixed layout and cleanup