Reorganized layout with serivice