Improve on frontend look and feel