Major Bug & Design fixes