Fixed layout for smaller widths,
fixed some alignment bugs.