layout finally fixed, time to work on contexts