Fixed #16

Elements aligned to grid