GUI cleanup & added native system look and feel