Cleaned up numerous views and added wins to multiple pages