Ui

Some template fixes