updates to gui organization