Change layout and clean up