Misc styling

Cleaned up styles, added misc formatting