UI restructured and works well now