Changed Design, fixed some bugs