Feature/small improvements

Small design/usability improvements...