Cleaned up code and made minor css tweaks