Changed layout and added percentage