login included - UI changes - bugs fixed