Removed factory nonsence. Added more layouts