More formatting and better IDs Layout elements