fixed lineair layout
cleaned up evertything