Added some layouts and overview logic
Merge