Removed some TODOs and small CSS Fix.