adding wrap class and cleaning up the code/positioning