Many layout changes and cleanup