Added some basic layout and concepts