Fix options modal
Fix login modal
Misc work on converting to bs3