Added panel and fixed buttons