Layout improvements, fixed alert saving bug.