All areas of market now with correct layout

I didn't comment anything because if I remember correctly every method
was an override method from the parent class... but if I missed
something or it's confusing, just let me know.