UI fixes
Replace buttons with proper navigation