Add button class and some tweak