updated composer and base layout