Indent ui and functionality completed - stage 1