cleaned up - and used some bootstrap - also link all seem to work