Fix Aligment and Tabs