Finished all aesthetic changes