Fixed margin issues for panels