MEDIUM : Re-arrange UI
MEDIUM : Correct EOL