Finish some layout and link