small screen and retina optimized, cleaned up code