Further design improvements, some work on empty view