Fix options positioning, cleanup CSS