Minor refactoring, UI improved by moving buttons to their corresponding sides.