version 2

with tabbed information and layout skeleton