Added retina 4" support and cleaned views