Fixed alignment and general fixes