Updated classes. There are still some issues with buttons.