Minor changes

Button sliding fixed / class refactoring