Design inconsistencies fixed

Place where I had messed up with the design, had inconsistencies, I
fixed them. Made new links, got better placeholders, removed redundant
files and removed external dependencies.