minor refactor and started layout
removed messages index, minor changes