Rearranged layout and cleanup