Changed some layoutt problems