Layout changes (no code)

Make it look more polish and clean