Aligment and grid fixes