Layout improvements, added Options dialog