Cleaned things up View-wise lining up stuff