First Commit
done
ui fixes
ui fixes
master commit