base layout & code clean up