Reduced min width to 650
Code cleanup