More spacing issues and top bar fixes -- Commit 3