Re-Arranged the UI slightly