Further layout tweaking - reworking into table