updating; changed some layout aspects