improve layout, fix problem with refreshing and problem with changing category