added action and some layout