Cleanup

common button moved from Misc to Common
Revert "Cleanup"

This reverts commit d4f4ea8d0ebcd54a59e84cc976a522b74ef40954.