Updated layout and added progress bar