About panel and layout cleanup