Cleaned up design and styles