Improved UI + pictures WIP