Improvements on button system and more modularity