Implemented settings and UI improvements