Resolved errors and added bootstrap support