Added tab based layout