Develop ui

FE / Markup tasks & improvements