Added some extra items to TODO
Added a basic layout