reworked layout and added more info