fixing up layout and review methods