Added panel buttons and fixed layout