Moved all subview sizing to layoutSubviews
Replaced defines with consts
Fewer magic numbers