Coding style refresh
Fixed pagination and tool line in folder