Layout work, menu clean up