changed base layout a bit