Fixed Project contents

Made new project and replaced all old components which caused unwanted
behavior.