* Changed layout to a tab based approach