Clean up & make all corner rounded for better look