Added progress bar and rearranged boxes