@viv : final layout and functionalities