Moar refactor. Autolayouts and such