FIX: Added sorting, actual coloumns and refactor

Signed-off-by: arturkandur <arturkandur@gmail.com>