More UI fixes and feature implementations...