Update TODOs
Fix up form styles even more