Major UI improvements
ui update for rcm