added more layout improvements