Update 1.3.1.1

Massive Overhaul in Design