Added styling, worked out some bugs