layout fixes

+ working on mock locations. will PR class and layout once its done.