ui and ux changes and a few others. final version before submission.