Layout Setup

Work on improving layout system
Add messages