Add some layouts and border colours