Navigation and Layout fixes