improved the front-end a bit more