fix up error message css and messaging
a little refactoring and shuffling