updated layouts and added use tests