ui updates,moved code fixed bugs