Some button/widget cleanup + added Panel