Revert "Cleaned up all the code and made formatting uniformed. Minor UI Changes"

This reverts commit e98f1826526dbdc879c780ac4e947cfd24b10789, reversing
changes made to ee521ebd659d3ec1e4fb6c2f3603b8ac13477616.