Mostly css changes to make the colors work
Contunued updating forms