[TIMOB-15482] Cleaned up some css and code.
[TIMOB-15482] Fixed some the last set of bugs (for now I'm sure)