fixed some bugs, improved UI for consistency