Restructered layout, rolled back to topcoat light theme