Added todo.
Removed padding on layout view.
Fixed border.
(Refactor) Pull up.