Refacotred some methods and slightly changed the UI a bit.