Added custom panel layouts and fixed margin bottom for tabs
Merge