Sanity Testing and fixing issues and styling