improve general looks and layout