Revert "Navigation and Layout fixes"

This reverts commit ec494e038478b38aaed451272302685949708fa2.